changed base64 encoding to no wrap
Merge remote-tracking branch 'origin/master'