Fix issue #130
Merge pull request #131 from emirhartato/develop

Fix issue #130