Merge tag 'v1.1.4' into develop

v1.1.4
Fix #7
Merge branch 'release/v1.1.5'