Fixed merge conflicts
Added licensing message
Removed crypto and using openssl base64