Merge pull request #14 from AnthonyAMC/master

Why do i have to round robin these branches!?!
Merge pull request #15 from AnthonyAMC/development

Merge pull request #14 from AnthonyAMC/master