Ver 29

Changed codestyle