Fix issue #30
Merge pull request #58 from git4ve/issue_30

Fix issue #30