Close #59
change