Merge pull request #100 from mcnewton/rlm_pap_tidy