fixing bug
Merge branch 'master' into Release_2
Merge branch 'Release_2' into gh-pages