Add more handlers
Merge pull request #7 from wylst/more-handlers

Add more handlers