cryptix Merge pull request #849 from iplesko/master …