Merge pull request #7 from mithro/master