Works against 1.0.1 too