extra code with some bugs fixed
Merge branch 'master' of https://github.com/mkachanovska/cemracs2014