Merge pull request #19 from ismailsunni/develop

For fixing #18
Merge remote-tracking branch 'origin/develop' into develop