fixes issue #2  Requesting a pull to timolson:master from douggie:account-manager