Fetch changes from 5.04.03
Translted 5.04.03 changes.
Merge pull request #20 from Trigonometry-F/develop

Develop master to 5.04.03