Corrected handling of always calc hashes flag
Merge pull request #384 from rcordovano/develop-rc1

Corrected handling of always calc hashes flag