fixings....
Merge branch 'master' of https://github.com/mkachanovska/cemracs2014