Merge tag 'v1.1.2' into develop

V1.1.2
Fix #6
Merge branch 'release/v1.1.3'