Fixed #2
Preparing release v0.3.1
Merge branch 'hotfix-issue2' into master