Merge pull request #141 from tanay1337/master

Fixed Bug 1110833