3.1.0 - Code cleaning and optimization