Updated some changes from master