Merge pull request #101 from dneto0/clspv-generator

Reserve generator 21 for Clspv