Refactored to use a future to wait for the data.
Merge pull request #1 from digilord/master

Refactored to use a future to wait for the data.