Merge pull request #4 from rudimeier/master

some minor cleanup