Merge 0.3.0 commits from develop branch