Rewrite afterword according to mail feedback
Merge branch 'master' into gh-pages