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

issue #4
fixes #24