client1 changes
Merge branch 'master' of https://github.com/pranitp/pre-tested