Fix for travis ci
Merge branch 'master' of github.com:flowcode/wing