Improved addressbook logic
Merge pull request #34 from telehash/improved-addressbook

Improved addressbook logic