Fix bug where bookmarklet not working
Merge branch 'develop' into release-0.2
Merge branch 'release-0.2'
Merge branch 'master' into gh-pages