Final commit, this version will be sent to Paul de Mast.
Final bugs have been fixed.

To all collaborators: thanks for collaborating!