Merge pull request #2 from chadicus/master

Some initial cleanup