Milestone 0.2.0.M1
Prepare for next round of development