First Commit

First Commit
Merge pull request #1 from ShayneP/master

Merging to development