Issue #97

JLiang fixed IntChanneling
Merge branch 'feature-setJL' into develop