Merging Karthik's changes
Merge pull request #2 from gvwilson/master

Merging Karthik's changes