Update code to development version of 1.7.1