Merge pull request #4 from tgstation/master