24/02/14

extractor updated, two versions, new one has only basic function