Merge branch 'release/v1.0.4' into develop
Add license
Merge branch 'master' into develop
Bump version to 1.1.1
Merge branch 'release/v1.1.1'