added header specifying this is an MIT license
Merge branch 'master' into dev