Merge branch '24-qualified-generic-token-types' into 'master'

Resolve "Qualified generic token types"

Closes #24

See merge request !11
1 job for master in 2 minutes and 18 seconds (queued for 2 seconds)