more configuration options
Merge branch 'hotfix/1.2.0'