Merge pull request #1 from boithu/master

Blabla
Merge pull request #2 from kraussimon/master

Merge pull request #1 from boithu/master