change wait time
Merge branch 'master' into popular_tags_with_db