Merge pull request #136 from avsm/master

Travis: fix dependencies