Merged branches

Signed-off-by: Laex <laex@bk.ru>