For 8.0.1.0
Merge pull request #128 from VeryBigBro/patch-10

For 8.0.1.0