Merge pull request #1 from nlblunt/development

Removed old files
Merge pull request #2 from nlblunt/development

Development