Per issues #31 and #32