Fixes #32
Merge pull request #48 from cericoda/master

Fixes #32