Merge branch 'master' of https://github.com/jacob-behnken/devicetype-…

Merge branch 'master' of https://github.com/jacob-behnken/devicetype-… #14