Vadim

Merge from branch vadim to master