Merge pull request #58 from XavierBerger/devel

Version 2.8
Merge pull request #61 from XavierBerger/devel

Version 2.9