Rc16.updates

Merge #52 and #53 to 2.3.0-release-candidates