Merge pull request #17 from bikashchoudhary/master

Creating Pull Request
commiting 25
commit 28
resolving conflict