Merge pull request #2 from pondering/master

clean up