Fixed issue #9 - devices not shown when not tracking.
Merge branch 'bugfix-issue-9' into develop