merge successful changes from devel to master branch