some changes from my local pc
successfull merge