branch_Simple_19.12.2014_-6594039155311374694

changes