#31, #32, #33, v0.4.2