Updated submodules: applied chasester's changes