ZCLOUD-186: improve detect
Merge pull request #6 from dror-g/master

ZCLOUD-186: improve detect