branch_Simple_17.11.14_-826462633313431440

changes