Remove extra base64, fixed tests
Alternate inline
Merge pull request #21 from ithurtsus/master

Remove extra base64, fixed tests