General tweak, allows #295 and improves EVERYTHING
Fix #295
Increase timeout, proven to still work
Merge pull request #308 from aesedepece/fix-for-issue-295

Fix for issue 295 and more awesomeness