Added in previous files
Merge pull request #1 from fredlawl/development

Added in previous files