Merge 0.1.0 back into master.