Merge pull request #1 from cboillet/master

test
Merge pull request #2 from stephysim/master

test1
Merge pull request #3 from stephysim/test

Merge pull request #2 from stephysim/master
Merge https://github.com/stephysim/LO21 into deve