Merge pull request #1 from DITgroup2/master

pull for John's fork
test
test
sabees changes of Account class
Merge pull request #12 from joohnok/master

sabees account class