Integrating with the new code by Yathi
Merge pull request #1 from Yathi/master

Integrating with the new code by Yathi