Refactor extractor
Merge branch 'master' of github.com:jdavis/ducking-dubstep