tailhook Merge pull request #579 from dfreese/patch-1