Fixing setup issues
Merge pull request #3 from sushilr/puneet-develop

Fixing setup issues