Refactoring a to maintain BC
Merge pull request #2 from youngguns-nl/zf-3371

Refactoring a to maintain BC