Commited changes from Master Branch and fixed merge errors