Merge branch 'master' into develop
Change package name and add keywords on composer.json
Merge branch 'develop'