rake
Merge remote-tracking branch 'origin/master'
ControllerExtractor implemented.