Increase timeout - fixes #104
Improve debug options