fix for breaking other modules
Raise timeout to 20 seconds.
Merge pull request #36 from avos/0.1

Fix for breaking other modules