fix #15
add #15 and #16 specs