* Finishing off Issue #14
* Cleaned up jimshoe's weird whitespace