massive rewrite for PSR and just a code/logic cleanup also
if there is just one account then we don't need to choose a random one
Merge pull request #31 from XboxLeaders/develop

Merge Develop into Master