bug fixing
Merge branch 'master' into newdev
merge bug fixes