Adding device detection
Adding device detection #13 (Thorsten commit)