Don't commit changes here!!

You will lose them.
Merge pull request #18 from PC-Logix/afterlifelochie-is-still-breaking-stuff

Merging in my changes over Michiyo and DrakeBD.