Iss 38

Fixes #38 
Technically fixes #15 , but I haven't made more accounts to test yet.