Merge branch 'ashish_1'
Merge pull request #2 from Dexteroo7/ashish_1

Ashish 1
Fix conficts during merge
Fix conficts during merge