More updates for the latest version.
Merge pull request #1821 from niemyjski/patch-3

More updates for the latest version.