start working on 0.6.1-SNAPSHOT