Merged #195 "Rename redirect method"