Start working on 0.3.6