Revert "Revert "Issue #274 completed""
Merge pull request #280 from EricpolUkraine/revert-278-revert-276-development

Revert "Revert "Issue #274 completed""