Changed: All, solved some issues merging - thkaemmerling