Merge pull request #29 from muddafudda/master

Merge