added options/func
Merge branch 'master' of https://github.com/metaphor-adp/Metaphor-ADP