Fixed submodules issue
Merged