htordeux priest changes merged manually
merge origin
fixed #377