Merge pull request #1 from zendgroup/develop

Develop
update workflow, base module