added buildup for scipy
Merge branch 'refs/heads/develop'