added some scipy 2014 stuff