Merge pull request #137 from tanay1337/master

Fixed Bug 1103969