Merge pull request #25 from muddafudda/master

Merge