Adding all changes
Merge pull request #4 from sudnipun/nipun-dev

Adding all changes