Merge pull request #2 from tgstation/master