0.2.0 to master

Merge 0.2.0 back into master.