Close #79
Close #78