use real device_id, check for unknown device
Merge branch 'master' of https://github.com/nuggad/targetometer
Merge pull request #6 from nuggad/master

Merge master to production