finishing touches and comments
Merge branch 'master' into gh-pages