Error fix
Merge branch 'master' of https://github.com/Malow/NotDeadYet
Warning fix.