Merge branch 'develop' for version v1.1