Should close #69