Let's work on 0.2 in the master branch