Change timeout to 30s
Correct comment
Merge pull request #13 from hwhelchel/cleaning

Change timeout to 30s