Merge pull request #148 from optopus/device-count-location

Device count location
fixed search string regex to recognize numbers
Merge pull request #150 from optopus/fix-search-regex

Fix search regex