Doing it "just like theirs" instead of the way we HAD been doing it... thus requiring commits to "fix" it... yay!
Merge pull request #55 from pantheis/master

Doing it "just like theirs" instead of the way we HAD been doing it...