Version 1.3b
-modularisation terminee