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

issue #4