Merge pull request #6 from mehlis/master

minor fixes