Merge branch 'develop'
Added MIT license;
Merge branch 'master' into develop