small changes
Merge remote-tracking branch 'upstream/master'
..
Merge remote-tracking branch 'upstream/master'
Merge pull request #287 from Ranjith15/master

small changes