Updated for 4.21
Merge pull request #15 from xQxCPMxQx/patch-9

Updated for 4.21