Merge pull request #1 from tgstation/master

Fix my own branch,