Merge pull request #121 from kiranhugo/master

few fixes ...
.
.
.
Merge remote-tracking branch 'upstream/master'