Merge pull request #1 from omkar-ramtekkar/Phase1

Initial Pull from phase1 to master