Merge pull request #146 from hmiko01/feature-144-device-type

Merge pull request #146 from hmiko01/feature-144-device-type #9