Fixes #13
Merge pull request #14 from akkie/master

Fixes #13