Updated for release (v1.5.0)