evincarofautumn/kitten — pull request #14 by perimosocordiae (2012-07-26 08:11:59+00:00)
Title: Fix issue #8, plus some minor changes.

Feel free to cherry-pick from these commits; they're not really related.