hsic bugfix and interface changes
Merge pull request #1926 from lambday/feature/hsic_bugfix

hsic bugfix and interface changes