Updated with everything in master now in this branch