Fixed issue #16
Merge branch 'hotfix-0.9.1'