Ensure handlers are applied correctly for all files.
Fix lint issue.
Merge pull request #6 from totherik/shortstop

Ensure handlers are applied correctly for all files.