Updated for release (v1.0.2)