added scipy function support
Merge branch 'unstable'