#15, #16, #17
v0.5.1 → v0.6.0