Merge pull request #461 from rvermeulen/rvermeulen/add-webhook-handler

Merge pull request #461 from rvermeulen/rvermeulen/add-webhook-handler #3145