NameTokens tuning.
Merge remote-tracking branch 'origin/1.0.0' into brandon_presenter18
Merge pull request #24 from ArcBees/brandon_presenter18

Brandon presenter18