Fix

Sir, please go through my commits, where I have cleared mentioned the changes I have done. 
You can then merge the branches if you are convinced.