Fixes #40 Update ZAP dependency to 2.2