Merge branch 'devel'

Signed-off-by: negram <bespoleznyak@narod.ru>
Merge branch 'master' into devel