squash changes
Merge pull request #242 from jjYBdx4IL/master

Yes, just a Travis issue. It runs in 2-3 minutes. LGTM