Missing commits from the master branch

There are 12 commits and 9 changed files that were not included in the previous pull requests. This is because the previous requests came from the branches "patch-1" and "patch-2" instead of the master branch.