closing #19 with space to _ changes