Merge pull request #18 from claudius108/master

Merged improvements from Matthias Guth
Merge pull request #19 from claudius108/master

New merging with improvements from Matthias Guth