Merge pull request #1 from tapanthakur/local2

Local2
Merge pull request #2 from tapanthakur/master

Merge pull request #1 from tapanthakur/local2