Updated for new release: 1.6.0