branch_Simple_17.12.2014_-8350044313821833517

changes