fix doc and travis build
Merge pull request #141 from ricardclau/master

fix doc and travis build