added device name field.
Merge remote-tracking branch 'origin/master'