Merge pull request #748 from lovmoen/master

Renamed zbase64 to zarmour.