This is James' commit
Merge pull request #4 from moorej12/master

This is James' commit
Karl's commit