Increase timeout to 30 seconds
Clean up
Version 2.0.3