Merge pull request #1 from StefanRvO/master

Fast forward
Merge pull request #1 from Projektgruppe3-RobTek/master

Merge pull request #1 from StefanRvO/master