Try out this development branch
Solving conflict whit merge development to master