Merge pull request #27 from FunkyCat/master

Fixes #21 issue. Welcome FunkyCat!