Fixed use of 'comprise', fixed end-of-class comment on one-line-install.
Merge pull request #408 from ssteinerx/master

Fixed use of 'comprise', fixed end-of-class comment on one-line-install.