Fix for current massive error (issue #18)

Note: To pulish the changes for Chrome, extension needs to be reworked
for manifest version 2! It's a separate but blocking problem.