added
added tests
Merge pull request #551 from john-hill/PLFM-1998

Plfm 1998