Shaky base64 encoding in the url
Merge branch 'dev'