c++ code by Javi
Merge branch 'master' of github.com:stared/qubism