manual pull from martydll : ), Clean up (better support to submodules)