Merge pull request #1 from wagnert/master

Intergrate local/remote context connection usage