bug fix 1

merge bugfix1 into master