Now working on 0.2.0