Merge tag 'v1.1' into develop

V1.1
Fix #4
Merge tag 'v1.1.1' into develop

V1.1.1
Merge branch 'release/v1.1.2'