main update 13.06.19

Started by frood66