Version 1.0.21

Minor fixes & performance improvements