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

Merge https://github.com/stephysim/LO21 into deve