Corrections
Merge pull request #5 from thomasklein/master

Small corrections after last commit