implemented address finder
Merge remote-tracking branch 'origin/master'