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

commit minor changes for branch 2.02