Fixed Bug 1096215
Merge pull request #135 from tanay1337/master

Fixed Bug 1096215