cipyright
merge
Modified copyright
Merge branch 'master' into gh-pages