closed #3426, #3477
Merge pull request #9 from jdcc/dev

Fixes bookmarklet