updated from 0.6.0 to 0.7.1