fixes
fixed conflicts
Merge pull request #3 from manpreetssethi/manpreet

Manpreet