match interface to readme
Merge branch 'make-travis-work'