Use (thing-at-point 'symbol) seems better because underscore, which is used very often in many programming languages, is not a word character.
Merge pull request #5 from kennyluck/master

Use (thing-at-point 'symbol) instead of (thing-at-point 'word)