Applied bugfix for #3 and for #5 on the bookmarklet version