Merge pull request #3 from muralikrishnat/master

Merge pull request #2 from muralikrishnat/Mainline
Merge pull request #6 from muralikrishnat/Mainline

Merge pull request #3 from muralikrishnat/master