cleanups
Merge pull request #5 from rgho/master

cleanups