Merge pull request #9 from carringtonsean/master

Rebase Development