Fix usage of "comprise" and "primary".
Merge pull request #34 from coonsta/master

Fix usage of "comprise" and "primary".