Release 1.3.1+21

Fixes:
* Performance improvement
