Bringing mainline changes by Megh
Merge pull request #198 from sandip-d/master

Bringing mainline changes by Megh