checking for errors while extracting
removed time measurements
merged from master
Merge pull request #13 from mpaciore/cleanup_and_fixes

Cleanup and fixes