fix issue #23
Merge pull request #24 from zavakid/develop

fix issue #23 pull request