merge in from @AndrewIngram for #58