Suported non-standard source directory and prefix
Merge remote-tracking branch 'origin/master'