Added some extra configuration options
Updating to lastest versions of submodules