Code optimization. Version 0.6.0b
Code optimization. Version 0.6.0b