merge Develop into Master (v0.1.0-dev)