Updated for 4.21
Merge pull request #14 from xQxCPMxQx/patch-8

Updated for 4.21