Fixing travis tests
Merge pull request #36 from computmaxer/master

Fixing travis tests