+WIP computations
Merge pull request #1 from mlecabellec/20131015a

let's merge