added license, incase it's needed
Merge branch 'master' into fastcpu_on_unix
Merge remote-tracking branch 'origin/fastcpu_on_unix' into fastcpu_on_unix