Fix #11
Merge pull request #12 from flaviut/master

Fixes #11