Merge branch 'hotfix/name' into develop
Merge branch 'hotfix/readme' into develop
Merge branch 'master' into develop
Merge pull request #2 from coffeepunk/develop

Develop