Finishedc change account
Minor bug fixes

Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from krodyrobi/master

a