Should close #102 / 2