update original brew file for #25 with some further fixes