Fix for #29, less conditional input parameter debugging
Merge branch 'f29-debugging-fix' into devel, fixes issue #29