Fix #25 and #26, bump version number 1.0.7
Merge pull request #27 from ismailsunni/issue_25_26

Fix Issue 25 26