some things for 18
another commit on branch
Merge pull request #19 from janwtobi/PR18

some things for 18