Added commits from master