added latest changes by palle to dev branch