Merge pull request #1 from AlmirKadric/develop

implmented base64 rewrite