Refactor device_manager
Merge pull request #346 from jonallengriffin/dm

Refactor device_manager