adjusted description and license
Merge branch 'master' into nightly