Merge pull request #1 from ashish-bhatt/master

Final changes related to checkout
Merge pull request #2 from ashish-bhatt/heroku/master

Merge pull request #1 from ashish-bhatt/master