fix license

see http://opensource.org/licenses/MIT
Merge branch 'master' into javascript