Last major updates to support issue #151.