init commit Andriy Bas
merged commit