Update macro list

Put in correct number of possible $USERx$ variables.
Merge pull request #7 from awiddersheim/patch-1

Update macro list