Merge pull request #23 from muddafudda/master

Merge