Merged. Now other devs can help me test this out. https://github.com/vitorpamplona/amethyst/commit/8841aa9a10605187336703ecc5e85eae095cb00f