Final fixes Release 1.0