Added a comment in Hunter case that needs testing
Merge remote-tracking branch 'origin/master'