Suggestions and Corrections #1

Suggestions and Corrections to the code written by @ashishm1995