Merge pull request #16 from FH-Potsdam/master

update master
Merge pull request #11 from WrongEntertainment/master

update master