refactoring to have multiple subjects
Merge branch 'master' of https://github.com/dmichiels/uContracts