Fix for support of create devices
Merge pull request #958 from shenrie/master

Fix for support of create devices