merged proposal; see issue #2