Merge pull request #54 from rodmcnew/PSR

Format code per PSR standards
fix build
Merge remote-tracking branch 'upstream/master' into PSR
Make Rcm Pass Code Sniffer