remove comment at beginning
Merge branch 'master' into gh-pages