2.2-beta

New features and bunch of changes