Fix South Park
Merge remote-tracking branch 'upstream/master'
Merge pull request #8 from danielvijge/master

Fix South Park