Fix travis and issue #22