Fixes for issue#24 and issue#29
Merge pull request #86 from git4ve/issue_24_29

Fixes for issue#24 and issue#29