finish to #14
add #14, #15