Merge pull request #1 from reimersjan/master

dinge
Merge pull request #2 from reimersjan/slave

Merge pull request #1 from reimersjan/master