Merge pull request #1 from dpbarrett/features

Features
Merge pull request #2 from dpbarrett/development

Development
Update file1
Merge pull request #3 from dpbarrett/defects

Defects
Merge pull request #5 from dpbarrett/development

Development