Merge pull request #2 from A3Wasteland/Development_main

Merge some Updates
Thanks AgentRev!