fix #24
Merge pull request #26 from cyberflow/issue#24

fix #24