Merge pull request #86 from tomzx/merge/84-to-3.x

PR for #84 done on 3.x
added travis-ci status
Merge pull request #91 from franzose/3.x

fixed #89