Updated for 4.21
Merge pull request #16 from xQxCPMxQx/patch-10

Updated for 4.21