Merge branch 'develop' into release/v1.1
Change version to 1.1a1