Updated for release (v1.6.1)