Zf2.api.cleanup

Contains PR #149 and #150