Change tenant for context
Merge pull request #153 from cortiz/master

Change tenant for context