Issue 80
Merge pull request #83 from git4ve/issue_80

Fixes for issue#80