merge in changes from #79