Minor updates for issue #18