Merge pull request #6 from dimasmith/master

Merge