Merge pull request #108 from arpitgupta/master

Remove the use of switchUser