Where, where the hell is Bill?
Merge pull request #941 from brandonvalentine/master

Where, where the hell is Bill?