Merge branch 'master' into gh-pages #3

Closed wouter-vdb closed 9 years ago