Merge pull request #1 from studio7am/master

Merge pull request #1 from bjsmth/master