pause code sploit hammered
Merge origin/master
corrections