Update to latest

Will just use the command line next time to merge latest upstream, accidental pull request