Merge branch 'develop'
Set a more informative README
Merge branch 'master' into develop