fixing bug
Merge branch 'master' into Release_2