Update from master branch
Update from master branch
Documentation
Fixed synchronized, need some tests