Bringing branch more inline with master