some changes made in master branch