Use default timeout only if it was not already set through the @Options(timeout =) annotation.
Merge pull request #207 from ccronemberger/master

fix for issue 206