Merge pull request #11 from brandhatchery/master

Merge pull request #10 from brandhatchery/dev