Amendments in steps 4, 5 and 6
Merge pull request #3 from ashishRTI/patch-1

Amendments in steps 4, 5 and 6