Merge pull request #503 from ouch-org/fix-clippy-warnings