initial commit
Merge branch 'master' into gh-pages
some final corrections