Merge pull request #503 from insertinterestingnamehere/comp

Residues