.
.
Merge remote-tracking branch 'upstream/master'
Merge pull request #229 from kiranhugo/master

fixed some minor issues