Merge pull request #36 from basz/master

avoid travis errors