Small attempt to get things faster
Merge branch 'dev' of https://github.com/eXpansionPluginPack/eXpansion into dev