phase 2
Merge pull request #1 from sanghal/master

phase 2