Revert "Revert "Merge pull request #30 from eriCCChaos/develop""

This reverts commit 460eac62ff7797e4aca490acbb1f71a68b61a5a8.