Uploading changes made by Clemens90 which he provided by email. Should become the new master version.