Working version, clean up
Merge pull request #6 from mcharris/master

Working version, clean up