Add support for multi-device contexts
Merge pull request #234 from kylelutz/multi-device-context

Add support for multi-device contexts