updated setup
updated for newer version of scipy