Merge pull request #1 from Northcode/master

merge
Tried to fix bugs
Debug
Merge pull request #2 from Northcode/master

pull
Merge pull request #3 from Jenjen1324/master

Pull