Update with 0.12.1