Milestone 0.2.0.M2
Prepare for next round of development