merge last changes from master to 1.0 before larger refactoring