remake Salavats changes in pull request 1056
Merge pull request #1491 from davidlange6/rebasedPull1056

remake Salavats changes in pull request 1056