Rc16.updates

This is the merge to 2.3.0-rc for #52 and #53