Merge 0.3 into master branch