Merge pull request #49 from GearChicken/develop

Develop
Fixed #45
Merge pull request #50 from GearChicken/feature/rewriteInputStructs

Feature/rewrite input structs