Merge pull request #37 from mdeters/quants-kinds