Many changes
Merge branch 'master' of https://github.com/nkskalyan/Team_Everest