Merge pull request #108 from tanay1337/master

Fixed Bug 1069541