updates for #134
changes for #134