Upgrade to version 2.3.1
Merge pull request #2460 from RainFlying/itools

iTools 2.3.1