Multiple accounts support

Hi,
Here's a tiny patch to add support for multiple accounts, please consider including it into your main branch.