Merge pull request #67 from catenocrypt/main