Solve submodule problem

Close #26