Merge pull request #17 from stronk7/master

NOBUG: Simple cleanup