Changes proposes in this pull request: - - - @ErikThiart