Mega Update
Merge pull request #56 from IOIOI/master

Mega Update (Hinweise beachten)