Merge remote-tracking branch 'xnta/development' into development
merge with xnta
Merge pull request #18 from AnnaStorozhenko/development

Test fix from asto