Fixed compilation and added submodule