fix parameter inheritance
Merge branch 'hotfix/0.1.5'