Added LHC by matteblanc
Resolved merge conflicts