Merge pull request #183 from evoskuil/version2

Use names consistently, add base64 test case.