Update per Luke to close #34 and update #32