Maintenance round.
Fix travis.
Does not compute.
Add again.
Merge pull request #7 from pekkis/maintenance-round

Maintenance round.