Refactored PR #101.  Thanks to Emilio, Ptah, and the LiveNinja team.