Merge pull request #44 from jgeewax/gh-pages

Automatic update of documentation.
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages