main is now main, added account provider.
Merge remote-tracking branch 'origin/master'