Merge pull request #5 from acmetech/master

A little clean-up to make things a little easier