Merge pull request #6 from fschwiet/master

minor tweaks