Got everything back to the working state it was in before I broke everything.
Merge pull request #50 from HexagonSystems/develop

Got everything back to the working state it was in before I broke every thing