Multiple changes towards v0.2.0