Remove trailing whitespace
Wrap lines to 80 chars and improve some comments
Merge master into gh-pages
Update documentation 133