added license statements
Merge branch 'master' into finishedVersion