Move to a separate device pool, fixes upstream #227
Merge pull request #255 from foobarth/master

Move to a separate device pool, fixes upstream #227