Merge branch 'hotfix/v1.1.2'

* hotfix/v1.1.2:
  Added composer
Fixed composer
Merge branch 'hotfix/v1.1.3' into develop

* hotfix/v1.1.3:
  Fixed composer