aproctor/thrillho — pull request #19 by tylerhebenton (2014-04-27 03:52:18+00:00)
Title: Merge pull request #9 from aproctor/master

Sync up with master