Merge pull request #46 from RacerTracer/development

Development