Update version using fold', to use a separate normalize function.
Merge branch 'fold'
Merge remote-tracking branch 'origin/master'