Added feature to device name (issue #31)