Now with 0.9.1