Merge pull request #1 from lovvorn/hunter

Update test
Merge remote-tracking branch 'origin/master' into hunter