Increase timeout to 500 seconds.  Closes #29