Rift spread fixed
Fixed rift remover finally
Merge remote-tracking branch 'upstream/master'