chi2
Merge branch 'master' of https://github.com/vsilv/fp
'merge01'