Merge branch 'develop' for the prerelease v0.3.1
Minor fix
Minor fixes
Yet another minor fix
Merge minor fixes of 'master' branch into develop.