Merge branch 'develop'
added MIT License
Merge branch 'master' into develop