norival Merge branch 'bugfix-0.3.1' into master