Code improvement
Updated to 1.3.1