2.3.0 wip

Resolve Issue #3