Merge pull request #3 from doug-martin/master

More code clean up
updated for latest version of it