Improved data retrieval
Merge pull request #2 from nickvirag/full_data_retrieval

Improved data retrieval