Updated to version 1.0 proper.