Add account support
Merge pull request #18 from widop/f-account

Add account support