1338h4x/2048 — pull request #2 by 1338h4x (2014-03-16 17:29:34+00:00)
Title: Merge branch 'master' into gh-pages

The correct way around this time.