Implementation of class-based extractor
Merge branch 'dev'
Bump to 0.0.4