Ver.: 0.2.5.15 - Improved performance