Updated latest changes from master