Merge pull request #4 from jrtew/master

Merging to get this branch up to date.
Merge pull request #5 from jrtew/Jordon's-Branch

Merge pull request #5 from jrtew/master