Close #40 #39