Edited License

:D
Legality Issues

Yeah.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into script-improvements