Ready to merge last changes from branch 1.0