Merging v0.2 into master.