fixed minor bugs on the address selection
Merge branch 'master' of https://github.com/neerbee/neerbee