v2.0-alpha proposal. See #129