Issue #364 completed.
Merge pull request #415 from nazariitashak/development

Issue #364 completed.
DIR Tests was modified.
Merge pull request #418 from nazariitashak/development

DIR Tests was modified. (Changes consern issue #264)
Merge remote-tracking branch 'upstream/development' into development