Fixes #25
Merge pull request #31 from astagi/master

Fixes #25