Updated, Fixed base64 support