Minor corrections in code
Merge branch 'master' of https://github.com/AbdealiJK/Shaastra_2k14_test