pass timeout to makeRequest
Merge pull request #26 from adamholte/master

pass timeout to makeRequest