Added - Rancor, NS Slave
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #512 from LordAlfonso/master

Added - Rancor, NS Slave