WaveMoL - Revision 26: /trunk