Merge pull request #11 from AnthonyAMC/master

Merge master to development
Merge pull request #12 from AnthonyAMC/development

Merge pull request #11 from AnthonyAMC/master