More debugging >.>
Merge pull request #32 from HexagonSystems/develop

More debugging >.>