Device_id support fixed
Merge pull request #1 from Gray-Wind/master

Device_id support fixed