initial
Merge https://github.com/Magmoz/galaxy