Merge pull request #16 from bikashchoudhary/master

Merging commit 14
comming 14
commit 16
commit 20
comming 21