Updates
Merge pull request #1 from phillyger/development

Updates