merge more changes made in the master branch