Better messages
Merge pull request #1 from Khan/pf-better-messages

Better messages