Updated this branch to the current master