Updated for 4.21
Merge pull request #18 from xQxCPMxQx/patch-12

Updated for 4.21