Merge branch 'master' into develop
README, LICENSE
Merge branch 'develop'