changes from branch into master

debugging