Fix: Custom output dir not work
Merge remote-tracking branch 'origin/master'