Fixes #31
Merge pull request #33 from thomasandersen/master

Fixes #31