initial commit without submodules
fixed merge maybe..