Merge pull request #2 from rgbkrk/byebyetenant

Bye bye tenant field