Merge pull request #67 from rbrueckner93/master

Nils' Änderungen zu mir übernehmen
Merge pull request #68 from rbrueckner93/Ruben_

Merge pull request #67 from rbrueckner93/master