Remove Python stupidity.

Whoops. I keep using 'self' instead of 'this'.
Diagonals.

See #12.
Merge branch `demarius` into `master`.