Fixed device name bug in script.
Merge branch 'master' into feature/strict-mode