fixitall
Merge pull request #3 from VertiPub/l33t-wb-505-hivefix

Save me from my bad copy/paste