Changes
Merge pull request #2 from conclarke/master

Changes