Merge 0.2 into master branch