Merging in updates to 504
added postmore plugin
Updated PSC 504