Release 1.5.2+40

Improvement:
* Optimized code for performance and maintenance
