Merge 0.2.0 into master