Fixes #20
Version bump
Merge pull request #21 from mottosso/master

Fixes #20