Changed License to MIT
Merge branch 'develop'