Merge pull request #359 from Kiroshima/master

More Chapter4, Showdown Setup
Properly connected
Merge pull request #360 from mentatzoe/master

Properly connected