Merge branch 'master' into gh-pages
Fixed copyright line
Merge branch 'gh-pages'