Merge pull request #22 from blackwithwhite666/master

Prevent multiple handler registration