Resolves #224 (closed) and #223 (closed).
See nshmp-lib-ng!73 (merged) and nshmp-lib-ng!74 (merged)
merged
mentioned in commit 4d831923