Make few more corrections.
Merge pull request #114 from Gozala/master

Make few more corrections.