add interface options, arguments, documentation
Merge branch 'master', accidental modification from different system