Fix things derr...
Merge pull request #29 from drewguild/DG/misc

Fix things derr...