Merge pull request #347 from hashcat/revert-346-master