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

issue #13