Merge Arctangent1759:gh-pages into zachlatta:gh-pages