Merge pull request #12 from AnthonyAMC/development

Merge pull request #11 from AnthonyAMC/master
Merge pull request #13 from AnthonyAMC/development

Added null checks and various redundancies.
Merge pull request #14 from AnthonyAMC/master

Why do i have to round robin these branches!?!