Merge pull request #14 from muddafudda/master

Merge