different fixes
merge origin/master