Bug fix #24 .
Bug fix #24 .
Merge pull request #29 from taymiri/pr24

Bug fix #24