Merge pull request #1 from rohitdhingra/master

merging code
Resolved the property file issue

Resolved the property file issue
Merge pull request #1 from sarvdhingra/master

merging code