Code improvement
Updated to 1.2.6