Okononenko

merging tbozhok with okononenko branch