2.0 dev

Merge 2.0-dev changes to make it easier to require them in composer