added code by user2
Merge pull request #1 from pixyish/master

added code by user2