Proposal: A bunch of fixes/enhancements for your PR

@ins0 

I hope you don't mind me proposing the following changes to your PR - please have a look and let me know what you think.

Related to https://github.com/zendframework/modules.zendframework.com/pull/263.