Close #3, Close #4

Signed-off-by: gyumin <1984jude@gmail.com>