Merge pull request #199 from tanay1337/master

Fixed Bug 1069541
Fixed Bug 1070073