Fix unused function warning, close #21