add base64 encoding fix typos
Merge branch 'master' into gh-pages