Add test to reproduce issue #10
Fix parameter detector functions (fixes #10)
Merge branch 'hotfix/2.5.7'