Merge pull request #1 from sankarvema/master

NFC