addAccount changed to setAccount
Merge origin/master