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

fixed some minor issues