merge in changes from #79

fixes #79