Updated for release (v1.8.1)