Merge dev for 0.01 into master.

Merged dev into master.