Initial commit from Subramanya
Some more changes
Merge https://github.com/nssubramanya/gittest