Updated so it works with current version of Zend Framework