Merge pull request #140 from tanay1337/master

Fixed Bug https://bugzilla.mozilla.org/show_bug.cgi?id=1110295
Fixed Bug 1110833