debug: option handling
Merge branch 'develop'