done
code review changes
added test
Merge pull request #1184 from john-hill/PLFM-2659

done