Merge pull request #15

May not be the best way to do this, but still.