Changes from tciket 123
Merge pull request #1 from saitanay/ticket123

Changes from tciket 123