added copyright statements
Merge branch 'master' into clustering