fix conflics
nicknames
better opts for get address
fix conflicts
Merge pull request #249 from matiu/feature/nicknames2

Feature/nicknames2