added standardization to traits.
Merge branch 'master' of https://github.com/bw4sz/FutureAnalog