merge new submodules from rnectoux