only waiting when there is no data
Merge pull request #1 from odo/master

only waiting when there is no data