Merge 0.3.1 commits from develop branch