updates for #46

updates for #46