add in new functionality
try to increase reliability of locating devices
Merge remote-tracking branch 'origin/master'