Changes in both the files by Nitesh
Merge pull request #3 from NiteshMeshram/feature/ticket2

Changes in both the files by Nitesh