Polished a little for 1.0 release