Updated for 4.21
Merge pull request #17 from xQxCPMxQx/patch-11

Updated for 4.21