Merge pull request #24 from ankurankan/dev

Dev
Merge pull request #25 from ankurankan/dev

correct tests
Update travis.yml for scipy