I merged several previous PRs. I will have a look again and try to merge. Please have a descriptive commit message when sending PR coz it is very helpful to understand what the PR actually does.
Touched, not typed. Erroneous words are a feature, not a typo.
