Last minute additions/changes. On we go!
Merge pull request #11 from arokem/scipy

Last minute additions/changes. On we go!