fixed up mcping
Changed something because people can't take a joke
Merge branch 'develop' into refresh