some more from 123
Merge pull request #2 from saitanay/ticket123

some more from 123