merge in 0.7.1