added an error message when the search timed out (10 sec)
Cleaned up code slightly
Merge pull request #21 from johanasplund/master

added an error message when the search timed out (10 sec)