Lots of small changes
Merge pull request #5 from mansimransingh/master

Lots of small changes