Improve support for multiple devices
Merge pull request #114 from Rio517/gh-pages

Improve support for multiple devices