Fixed so that the code does not crash, still doesn't work though
Merge branch 'master' of https://github.com/samli177/S.M.A.U.G