Hotfix/zf2 2 bump

Manually merges #18 - fixes #16 and #17