Adding MIT-LICENSE Closes #655
Merge remote-tracking branch 'upstream/master'