SRP for the tokenisation
Merge branch 'master' of https://github.com/pauldambra/SimpleMathsParser
fix merge issues