Bug fix release based on 0.2.0