Strengthened invariants.
Merge pull request #18 from SERG-Delft/invariants

Strengthened invariants.