Milestone 0.3.0.M1
Prepare for next round of development