Merge pull request #42 from jblowe/master

PAHMA enhancements and repairs, see individiual commits