Develop/v0.6.2