Fix for issue #9
Merge branch 'hotfix/0.6.1'
Fix issue #9