Merge branch 'feature/scipycompat' into develop

Closes #9.