Merge pull request #7 from metatype/master