Handler support added
Merge pull request #2 from define-null/master

Handler support