Merge pull request #33 from RacerTracer/development

Development
Merge pull request #34 from RacerTracer/development

Development