Didn't fully apply diff for #12
Merge pull request #13 from jcutler/master

Didn't fully apply diff for pull request #12