Merge pull request #1 from lethain/svven

Merge pull request #1 from lethain/svven
Extractor returns only specified data types
Merge pull request #2 from svven/master

Extractor returns only specified data types