update license stuff and source code header.
Merge branch 'master' into numeric