FIX: travis
Merge pull request #22 from mekman/travis

FIX: travis