Merge branch release-v0.1 into develop