A lot of new features!
New changes. Fixed merge problems
changes