This should close #19