Close #62
Close #67