changelog and license
Merge branch 'master' into feature-scheme