More fixes
Merge branch 'travis' of github.com:dlapiduz/clouseau into travis