zg help is more organized now ...
Merge branch 'develop'