Merge pull request #238 from Wakie87/zend