Gave myself credit
More credit for me
Fix updater
Merge branch 'master' into stable