Merge pull request #9 from carringtonsean/master

Rebase Development
Merge pull request #10 from carringtonsean/Development

Merge pull request #9 from carringtonsean/master