Commit and track missing new files
Fix merge conflicts so m21 doesn't have to
Merge pull request #249 from zathras-crypto/0.0.9-Z-STO

Couple of files for PR247 were untracked and didn't get committed