Feature lwrp improvements

Rearrangement of PR#101, with perfect style guide validation