Merge branch 'master' into develop
written basic readme
Merge branch 'develop'