Working towards 0.2.0