Develop/0.2.0 merge to master