merged new changes with master branch