v0.9.9 (fix #11, fix #16)