Stuff
Merge pull request #30 from drewguild/DG/misc

Stuff