Bring in changes for #18