Merge pull request #1 from smenes/faithful32_1.6.4