Re-added new files
Merge pull request #831 from KevWright/master

Re-added new files