made complaint with last changes in master
made compliant with last changes in master
fix errors arisen from merging and solving conflicts