+WIP computations
+ Corrections
Merge pull request #2 from mlecabellec/20131015b

let's merge