kyleconroy/hawkthorne-journey — pull request #300 by HazardousPeach (2012-09-18 03:09:19+00:00)
Title: Fixed issue #295, and snuck in some comments while I was at it.

Pretty self explainatory, although it it takes a while to pull this in I may have #294 done too.