Updated to 1.0-rc-2