Updated version (1.7.1)