I am tired of doing this
Merge pull request #2287 from Gamerofthegame/master

Map and RIG changes