Merge pull request #1847 from daniel-honestempire/develop

Support for hashing algorithms other than SHA1 and MD5