Code cleaning, change of one phrase to a relation, and a slight tweak to the example.  Bump to version 2.