Merge pull request #229 from kiranhugo/master

fixed some minor issues
Merge remote-tracking branch 'upstream/master'