Update from git

Anatoly Mironov