issue #4
Merge pull request #25 from daimos/master

fixes #4