#21 - Finished work on data extractor
Merge pull request #62 from mattrebor/rob

#21 - Finished work on data extractor