add timeout
Merge branch 'master' of github.com:yangxie/Dj-Master