Merge pull request #2 from aczirkle/master

Merging
Fixed some errors with Setup and isJumpSpace
mergers