Update from git

By Anatoly Mironov