Commit 2.0 update

First version of 2.0 branch.

Need update to sync with last commits from 1.x