fix issue #80
Merge branch 'travis-fix' into fix-80
Merge pull request #86 from skywinder/fix-80

fix issue #80