Merge pull request #1 from SebiH/master

A few more files, so they're out of the way for future commits
Changed port for debugging to 73254