add #18 spec
fix #18
add #19 specs
fix #19