Definition 1 and 2 made explicit
more answers to reviewer 4
Merge pull request #3 from marcbezem/master

Some more changes suggested by reviewer 4 incorporated