Updating for branch pull
Pull and merge with master