let's try pre, shall we?
Merge pull request #18 from Trott/gh-pages

let's try pre, shall we?
Merge branch 'master' into gh-pages