Updated to 1.0-final