Fixes #1
Merge pull request #5 from emilsoman/master

Fixes #1