add replaceable tokens
Merge tag '1.0.5'