devicerental change
Merge remote-tracking branch 'upstream/master'
Merge pull request #265 from Rakeshadlagatta/master

devicerental
Merge pull request #266 from raghuvissu/master

bug fixes