Improved Modularity
Merge https://github.com/BennyQBD/GDX