Adding some changes to master