Fixes #14
Merge pull request #15 from simonlopez/master

Fixes #14