Merge pull request #1 from mattcarlos/development

Development
Merge pull request #13 from tonyrd/development

Merge pull request #1 from mattcarlos/development