minor cleanup from merge fixes
Merge pull request #11 from atdiehm/master

minor cleanup from merge fixes
Merge upstream.