Merged RJMurphy-master