Added guards for compilation on multiple systems
Merge branch 'master' of https://github.com/dlees/LMP