Merge pull request #1 from dandydanny/jack_branch

Jack branch
stuff