Merge pull request #30 from RacerTracer/development

Development
Merge pull request #31 from RacerTracer/development

Development