Merge branch 'Kelvin-branch'
Merge branch 'master' of https://github.com/chan-kelv/LMPS