Issue #9 : Major release 2.0