Prepared for next version
Trying out travis_wait